Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhance get_software_libdir to return lib or lib64 if only one of them contains library files #4513

Merged
merged 2 commits into from
Jun 7, 2024

Conversation

bartoldeman
Copy link
Contributor

There are situations e.g. with recent Gentoo where all 64-bit libraries are under lib64, but lib is seperate and used for other files and directories (e.g. lib/python), and for 32-bit libraries.

get_software_libdir would fail for such. To avoid this:

if only_one is True (default), and no specific file (fs) is specified (also default), and lib and lib64 both exist and are separate, and only one of them has libraries (shared or static), it returns that one directory.

There are situations e.g. with recent Gentoo where all 64-bit libraries
are under `lib64`, but `lib` is seperate and used for other files and
directories (e.g. `lib/python`), and for 32-bit libraries.

`get_software_libdir` would fail for such. To avoid this:

if `only_one` is `True` (default), *and* no specific file (`fs`) is
specified (also default), *and* `lib` and `lib64` both exist and are
separate, and only one of them has libraries (shared or static),
it returns that one directory.
Copy link
Member

@boegel boegel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@boegel boegel changed the title get_software_libdir: return dir if it's only 1 with libs enhance get_software_libdir to return lib or lib64 if only one of them contains library files Jun 7, 2024
@boegel boegel modified the milestones: release after 4.9.2, 4.9.2 Jun 7, 2024
@boegel boegel added enhancement and removed bug fix labels Jun 7, 2024
@boegel boegel merged commit 64bf5c6 into easybuilders:develop Jun 7, 2024
37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants